Cleaned currently unused code to get 100% coverage in this branch
Cleaned currently unused (but useful) code to get 100% coverage in this branch