Revert "Merge pull request #126 from DinaSaad/c1_Tharwat_Sprint1"

This reverts commit 172596ab2f63d5fb1f67e95562c28c01d2a12e6e, reversing
changes made to ce37d321a0827caef963d7ed6a182273d4ce0fb1.