remove random walk and cleanup base file names