removed obsolete code
Merge branch 'development'