qPCL plugin code cleanup