Remove lenses provided in diagrams-lib
Add type constraints required by lensification of envelope