Some minor cleanup/fixes in restored editor files

Change-Id: Idf22694ecbbb72a5759356e9338b7b95db9b0d7d
Merge "Some minor cleanup/fixes in restored editor files"