Refactoring, HYT-939 now separated