Remove additional and moves code to two supervisors