Small cleanup around selected controller