Remove dirty tricks