removed unnecesasry code