Removed some unused py compatibility stuff
Only add future callbacks if it is a future