Clean up
CLRHost changes