Remove unnecessary definitions