More simplifications
Fixing simplification for clip