Removed cancel chan and cleanup