[Shabib] Removed uncessary stuffs