update for reorganization. delete unused stuff