removed superfluous struct