removed obsoltete code