Cleanup code on top level files