minor cleanup of imports