Clean up catalog structs