Further refactor ukeGeeks lib, reduce external dependencies.