Remove dependencies on external widgets