Unnecessary constants removed

a few more tweaks, and pointless relics removed