removing functionality that does not work
Merge branch 'dev'