more cleanup
doing the rest of the work packages