Remove drift calculation here, do it at plot time