Revert "Removing some stuff"

This reverts commit 8d3cd8231acc713a411876935bd946650d332abb.
Revert "Revert "Removing some stuff""

This reverts commit 925d5605fe076b10551ee306d2a500bfa2c17e91.
Update