Some Clean Up