Remove dependencies that are now internal