Fixed cleanup trap