Minor cleanup of imports