Remove testing hooks