Remove unused target
Merge branch 'dev'