cleaning up for 2.x helpers