-more code cleanups/simplifications

15 files changed