House Cleaning

Just removes some stuff added while trying to get the loading stuff to
work correctly.

Spring cleaning is actually in order for the whole code base but not right
now.