Remove obselete code