fixup! Remove redundancy between clive and helpy/beekeepy