clean up and updating similar files