Remove unrelated changes, minor cleanup
3 files changed