cruft removal

cruft removal