Removed use of old constants