Updated dependencies. Remove unneeded stuff