removed uneccessary functions