Fix broken definition trunk fill

- Fix broken definition trunk fill (copy/paste error)
- Remove incorrect //etc code