ENH: Added cluster flags and remove debugging.