Cleaned up Doctor, CF, Rule classes