Modified format
Remove not using configuration
Modfied layout