removed some innecesary things