Cleaned house. Removed all currently unused/unneeded code. (We can draw from the repo history if necessary)