remove accept terms
Merge branch 'master' into layout