Clean up for 0.1