Tested OK. Commented out code removed.