Revert "Clipping issues"

This reverts commit e887d4b4d3dfa952b7907be685a0d249f8e6b517.
Clipping Issues