Removed uncessary stuff