remove some obsolete stuff