remove obsolete old hybrid stuff