Removed some unused dependencies etc