Cleanup (drops deprecated code)