Clean up integration within edits1
Implement correct