Removed some older code that was commented out.