remove logic changed