Strip hack code for clitesting