Removed unused #define
More changes regarding Python 2.7 compatibility