Removed logic