fix generic remove from db
Merge branch 'patch1' into integration