Cleaning up unnecesary file copying