Removed unued code