test-commit, worse loki removed
removed more stuff