Removed defunt usings