more cleanup in all files