Remove some now uneeded code.