Removed unneeded stuf.