Remove xsrf from this branch

Will wait until it is accepted into master