Untested -- removed a ton of more deprecated code

Removed a ton of deprecated code. Will test it and commit a debugged
version.