add missing return, remove unused struct