obsolete stuff removed