Revert "Intial changes has done"

This reverts commit 40fcf4265aba4e1fc4a5537fec535b161a39a58e.