Clean up of .java~ and .xml~ files (they make me mad)