Initial checkin.

Changed to ScopedRemoveFile.