variable clean up, catch special case