Cleanup of opt move