Removed various unneeded changes