Remove unused macro
Remove outdated comment