clean up code base