removing obsolete stuff