Simplify config
Simplify config
Remove registration code