Cleanup the code, remove commented out code etc.