Some cleanup of unused dependencies