remove configuration skip and and set logic