Clean-up environment injection