Tidy up of Farquhar code, removed old testing commented out lines