cleanup hotfix from windows laptop
Cleaned up file. Kept Master Head from Windows Laptop
keep unresolved for now