Remove a few redundant using statements