big clean up of junk