remove all remaining start/end py2k/py3k blocks