Removed some legacy code (that was commented)