Removed problems triggering Sonar errors