For this PR let's move it to the view for consistency with the rest of the code. The removal will be decided in PR #59