Cleanup in ComponentSelector and ViewController