cleanup some controllers