Hqadmin cleanup