unlink original after replacing file
remove intermediate file used in handler
Merge branch 'unlink-intermediate'