Removed some unuseful changes from previous commit