Removed old functions
Removed uneeded functions