Add code coverage support
Remove unused code; use delegator