Clean up unstable

This PR is to be merged to *unstable*! cc @todb-r7