revert lots of changes