Some cleanup after the last merges.
2 files changed