Revert "Delete unused elements"

This reverts commit 27fe62e373496142fe8843881ac967b2eb5858ea.