Removed uneeded functionallity