Revert "handle approval filtering based on client id"

This reverts commit 40d5cf52f13e92b0485bccb0b1a2f8b04e535ddf.