removed unneccessary functions