Remove unnecessary dependencies
Minor changes