code cleanup and remove old files
don't need those either