Operation: Strip Out The Crap - Phase 3

several improvements and removals - closes #9, closes #14