going to lunch
Merge branch 'steve'
Merge branch 'master' into similarity
remove used methods lost in merge