Removed some more unused constants