Revert "Do not keep reference for unused stuff"

This reverts commit 32df3f37826fee4c5920d7c9ae405713da64abc0.
Bump version