General updates
Revert "General updates"

This reverts commit ef2d98722f835290639e7c5b7ee2d85e3137fa1a.