Remove temporary/backup type files

Change-Id: Ia47b4c3ed4e41e5dc061dd16e5dd72f79a244cbd