Revert unnecessery changes from last commit