Removed some unnecessary things