Removing more tmp stuff.