Remove CTL big Hack which was problematic in msvc build