Test coverage and cleanups

It looks like it is unused, we might even get rid off of it completely.