First Stage: Source Code Cleanup...