Unused definitions removed