Remove some junk/joke code