remove underscored classes