Remove some stuff that didn't work anyway