added admin sync, cleanup