Remove injectivity environment
Code cleanup according to Richard's suggestions