Remove some stuff not using