Removed unneeded components