Cleanup of unused using statements in a few files