Removed obsoltete funcs