YAGNI cleanup and test coverage to 100%