Remove codes commented out