Remove deprecrated objects
More Py3k fixes