Removed some unused code that was already commented out.