Remove unused define
Remove #define in favor of static constants