removing cruft and cleaning up