Code works so removed old, commented out, code.