Removal of commented out code