removing more unecessary cruft