Remove dependencies on Nimbus