removed unneeded components