Removal of commented out main method