fix some edge case issues in the overdrive (possible segfault)
remove cruft.