fix: clean up redundant structure