cleanup and simplify
35 files changed