Added logic to remove 'future' data