Set statics to private for 3.1
Update statics for 3.1
Private statics again
Replace ModelAsController to prevent 404 status code overwriting redirect