Removing the conditional from the view