Cleanup extra code