Changed it to make 1 file per handler, so that removing happens before adding.