Massive cleanup done in 57a8a78a58eb96b47f6db4ede216707fb3587371. Ideal order no yet achieved