Remove few more instances of tempfiles