remove listfiles in Control and avoid writing mutiple times to the same file

Change-Id: I0ba40d58abe6791bea886f6404410abbdb1f1fe3