Cleanup reference to supervisor. Still not passing in configuration items.