Clean Up for 0.11