Cleanup, removal of unused manager classes