Since we've just changed the name, let's go ahead and remove deprecated code, so that we can start with a bit cleaner slate.