Remove unused struct and more

It is obvious fixes.