Cleanup uml schema