*removing cruft