wip: removed left over comments
wip: trailing cleanup