LAPTracker: More clean-up