Tweak setup() attributes
Remove dead #if 0 code