Fix broken definition trunk fill

- Fix broken definition trunk fill (copy/paste error)
- Remove incorrect //etc code
Merge pull request #463 from math1985/trunk-fill

Fix broken definition trunk fill