cleanup for main master