remove cruft, make this bastard work.