Remove closures from class files
Remove unused class
Update strucs