remove case function and contract support