Clean Up some more