Files cleanup. First step to implement dynamic search.