Revert "Revert "Removed some stuff""

This reverts commit dd21a52fca4bce207e2d27eb7654aac0acfb818a.

Revert "Removed some stuff"

This reverts commit
1fa15b6183efda0dadfff5257efd8b52a5890fec.