removed uncessary functions