Removed unneeded shtuff