Clean up more codes