Remove old constants, commenting and cleanup
More fixes suggested by @brendo