Remove dependencies

WIP