plotpoint table rename
merge cleanup