Kill painful commented out code (& comment)