Remove cement dependency