removed unnecesary parts