Remove Tameru as dependency