get rid of this *nasty* "subarch" stuff
add note