Cleaning the mess in the gi project:wq