Removing SONAR issues from apex-pdp basic model