Cleanup after checkin of first v2 codebase.
2 files changed