renaming and removing unnecessary dependencies