Revert "Toolkit"

This reverts commit b0ecbb50f9791398b1237b58b275276e980a82d7.