simplified more
remove cruft