removed some unnessary things