Removed unnecessary classes
Interval fix for shorter timespans