[JBWS-3793] More cleanup