minor cleanup, can't address the lifecycle bypass yet :(