First pass at journal cleanup and setup