Added dependencies and removed commetd code