Removed non-existent columns (2.5) and did some tidying.