complete remove function.
Merge branch 'dev'