remove some cruft - revert if you find any regressions