Remove unused code.
Merge branch 'master' into angular-model