Remove SupervisorComponent to simplify testing

Thanks to that we can have a single cake for the acceptance testing.