Cleanup and test commit from new machine