Removed complex code