Further Clean Up + Merge Fix