Add tomb package to cleanup goroutines