removed unnecesary thigns