Change task 'supervisor-simple' to 'supervisor'
Remove unused files