Changed dest dir and cleanup