Removed outdated code and other miscellany