All modules: Remove unnecessary dependencies and reformat using statement