try to improve the states to remove old configuration