Cleaner codebase because of fewer features!