Remove some unnecessary stuff