Git cleanup to early stage to fix compilation errors
Git cleanup to early stage to fix compilation errors