FLOE-108: Code clean up.