Removed old version of the code that was commented out