Custom patient report cleanup (Fixes: #5744, #5765, #5766) (#5751)