Updated name and removed unsused things