mark uml as broken and add some cleanups (not working yet)