MMLC-12 clean up admin structure.