reverting some uneeded changes