cleaning up some last cruft