JBIDE-14979 and JBIDE-14402 cleanup after denis' comments