Cleanup in preperation for potential lag compensation code.