FLOE-178: Code clean-up.