remove some obsolete code