Remove PQL stuff
Ongoing record work...