Getting rid of nonsense logic