Actually clean files after rendering?

Change-Id: Idddf073ad0e4fef42b7ef6a55ef1448bd71be3d6