deleted or renamed some stuff