removed uneeded functions