Work on removing units

This removes some units that I _think_ are unnecessary from the core.