Remove unused utility functions, remove old vars object on Shells.