Fix for Python 3
Remove old file
Fix Travis