Delete deprecated code that snuck in after merge