Housekeeping from previous version

+ Changed all references to CHDistantFarm to DistantFarm2
- Removed remaining JD comments from code files