Removed StateRef due to pointlessness (as agreed by the part of
the software team using it). Updated macros to reflect this change by
moving the constants from StateRef into their respective classes.
merged and cleaner