Fixes: #2627 We should be able to create link to object edition easily
Cleaned some unused var and other sonar reported problems