Simplify config
Keeper knows how to build config and filter options
Cleanup