PR for code review

deleted this po together with the static context.