Kill dead code
Amend sample format