Organremoval

Attempt #2 hopefully the right way this time.