removed some unnecessary things from the code