Remove deprecated code; adjust request/route specs to pass; other stuff