Removed unneeded items