Cleanup edits