Improved file concatenation and clean up.