removing unnecesary stuff