More junk removal.

Removed code marked as "junkyard"