cleanup (unused code)
Merge branch 'master' into beta