remove lots of now-redundant cruft