Massive rage cleanup and simplification