Removal closes #46
Cleanups refs #50