Minor cleanup of usings