Fix merge - remove leftovers