removed decruft