Updated for removing view helpers