Further Clean Up