Removing  from controllers where it is possible