code cleanup for clientFilter