Revert "Removed unused objects"

This reverts commit fa1d3fc52b021822047d7a1e6f0deb09ca60dd5a.