removed and fixed some catalog references.