removing superfluous cruft, keeping other cruft he he