Clean up my import mess.