Clean up predicated handlers implementation