remove obsolete stuff