More visibility form to core and cleanup some controllers
Missed from previous commit