Removed unecessaries