removed unnecesarry components