Source Cleanup, ready to build!