Removed uneeded functions