Return self to allow method chaining
Remove unnecessary cruft from supervisors