remove cruft and improve journal methods