Revert "Revert "Revert "Deleted unnecessary code"""

This reverts commit d87f96b414fd17c9467cc2c1ff479e08cabda30e.
Revert "Revert "Revert "Revert "Deleted unnecessary code""""

This reverts commit bf2df2b31648df8d59c09647d37410ee83bcf510.