New cutoff kinds. Big time code cleanup.