BS-8920, start refactor by simplifying current code.