remove unnecessary yield value; fix default @records