Removed cheetah dependency