Tidy up commented-out code etc