Clean up of commented out code