Hotfix delete & general sonarcloud feedback

• Fix getmapping in delete
• Fix general sonarcloud feedback on issues (at least partially)