Remove some deadc0de