Remove all commented out code, please