Further work on Maid manager sync and cleanup.