Remove Sarissa dependency