lots of clean up of unused files