Removed unused class DateYear and fixed children bevavior