Removed unnecessary constants