remove some more un-needed cruft