Remove unnecessary code and dependencies from catalog. Integration with relational is done by relational agent