Remove unnecessary struct