Cleanup for 4.3

Cleanup after ReBase 4.3.0