Cleanup per comment

- Removed unnecessary list comprehension
Cleanup

- Removed code commented out, no reason to keep it
- Simplified code for py2/3 conversion support