Clean up extra code