useless cruft removed