Graphics Module Clean Up First Pass