removed/comanted unused items