remove unneeded setup structure (commented out)