Rename CLEANUP macro to a more meaningful name