Removed lots of deprecated code and lots of air.  Borked some stuff.