Stripped off more cruft