Final commit of last bit of clean-up from previous time.