Started work to remove Eina