more cleanup related to thin/unthin style of displaying stubs