removed unneeded local definitions