Remove some stuff from previous commits