Temp files are cleaned up.
Removed unused dependency.