Removed a bunch of deprecated code.