removed unnecessary definitions