LPS-51215 more cleanup in Journal