Eliminate funkit dependency