further reduction of hacks, shell builds