builds, removed cruft