change some config and remove swap circle