Organ rewrite mapclean attempt.
Merged with organ removal code.