Remove some catalog buildmessage.asserts