removed uncessary stuff