Removed unless code