remove obsolete hybrid stuff -again