do not disable this anymore
more cleanup related changes, more or less obscure