Revise Thief rule, remove garbage