runtime : cleanup a bit