removed unnecesairy code