FLOE-226: Code clean up.