It's source code cleanup time!