Removing unnecessary using statements