removed old commented code as it's been tested and I believe is kosher to do away with