Cleaning up some pointless state and erroneous logs