Huge cleanup.