Fix formatting and comment out figures until we work out what to do