FIX merge clean-up