Germany says controversial issues removed from Trump's Ukraine peace plan