Increased chan buffer and removed unused lines