Cleanup non-functional codes