A little cleanup before editplot branch is created