Removed superfluous logic