Removed unneeded  stuff.