Remove old commented out code
Implement property grouping. Fix #94