fix cleanup functions