Integrate ptreap
Cleanup old SP stuff