Removed unusing code