Remove unnecessary temp files.
Merge branch 'xificurk-cleanup' into next_release