Removed unneeded definitions