additional clean up for common
7 files changed