Remove some stranger code