HH-35564 update configs and remove some trash