Remove more 0-8isms
merge bug26131 into bug26133
Remove redirect handling methods from model API
merge bug26133 into bug26135