Removal of unnecessary using statements