Remove dependency on circus.util