remove junk
 changed stuff around