Revert unnecessary commits from this branch