I am removing these from the source code in preparation for an