Remove old files for clear tests

Change-Id: I61d09a7a5debdeb02cef623c430f4dd197c04447