clean up unnecessary differences with kwd branch