unecessory stuff removed