stripping back even more cruft