removing 2_3 stuff that wasn't intended for this branch