Removed uncessary code