Removed a bunch of unused constants