Remove dead function and switch to mka