Remove some extraneous imports