Cleanup for windows dev work