JBIDE-6313 small cleanup for prep of this jira