Removeing more excess stuff.