Removed some unnecessary changes