removing unnessary stuff