Removal reinstatement WIP 2 (works now, pot. cleanup before merge necessary)