Removed some unused units.