Removing old Supervisor stuff