Cleanup, remove map stream.