WIP: Removing supervisor