clean up code locations