removed unnecessary dependencies
cleaned up base