Clean up extraneous imports