fix missing and extraneous imports