Cleanup of temp files refs #47