Cleanup some code.
11 files changed