Updated remaining controllers to only use dataService