Clean up, preparing for 1.2