more comment fixes
comment cleanup & remove unused functions
fix static vs non static method in tests