remove comments
fix broken test for py3