add call to groove_finish
fix cleanup code deadlock