I've removed the commented out code - no need for it any more.