Cleaning master sprint2

@karim-elbawab @mostafa-adel @AmrEmara @samehmetias please review