Cleanup previous approach to CSRF protection