Tidied up unnecessary commented-out stuff