This makes me happy. So much removed, so refactored - very lean.