removed unnecesary things