cleanup dependencies and make it compile (test do not compile though...)