final cleanup from oopsfest 2k13