Remove needelss configuration
Fix execution order
Remove unneeded lines