Removed unnecessary entries
Renamed fetchsupervisor