cleanup and simplify
134 files changed