removed inused things