Remove unused macro
Replace static with const