FLOE-195: Code clean up.