Sourcecode Cleanup Prep