More Shell type cleanup