removed some unnecessary things