Lots of tidying up, removing logs we don't need anymore