Remove unused variables
Remove unused Import
Remove Unused Private Field
deleteTypeEntriesByIds should be public
Add missing If/Else Block Braces
Remove println
Merge branch 'DDBNEXT-1631-BOZ' into develop