Merge with Quan
Remove ppedit stuff
Optimize import
Reformat before merging in