removed unneeded items