Clean up for 1.1