Remove some leftover imports