Cleanup: remove deprecated code