Fix for Python 3
Remove old file
Add Python 2.6 support