remove some leftover non-generic stuff from the initial import