Remove Ebb dependancy temporarily