Fixed persistent trees in client

Also the delete method used in the fire processor is now correct with
Patrick's previous fix.