Removed some dependencies for a lighter load