remove some more cruft and change invocation pattern back to default