Cleanup
More fixes for deprecated stuff