Replace stuff removed to allow merge