Remove some unnecessary things