remove cruft
renames