mostly deleted motivated by code revision