Remove old commented-out test
Remove old commented-out functions in header
Cosmetics