Removed unneeded components.