Entity simplification; phase 1.