clean up extra imports and a few other warning messages