Remove old code from 'master' branch, moved to 'old' branch.