Removed all defines for constant variables