tidying up. Removed a load of commented stuff.