Cleaning the project and prepare for future cleaning
Updates