Removed test code that was commented out anyway