eww changes, remove cruft