removed ws and datastore as they don't really have a place in a framework
removed additional dependencies from build