Simplify configuration
many changes, not tested