Cleaned up navy_macros.h of unused code