removed old-style comments