Remove dependencies
Cleanups