Additional Clean Up