Remove leftovers from PCQL package code
Update makedoc.g