Removed unnecessary definitions from previous commit