Removing unneed code and Commented some code if need in future