Using the team and individual deliverables from controller

Removed the extra if condition when rendering both team deliverables
and individual deliverables.