remove a bunch of lifetime annotations