Trim dead code
Criteria