Organ rewrite mapclean attempt.