Clean up for 4.3