Get rid of unneeded construct struct decleration
Remove unused imports