If not, are there cleanup handlers or something I can add to accomplish this?