Removed unneeded items at this time