Cleanup

Fixes comments in BlockBindingTransformer

Fixes FindUnusedImports (it broke due to compiler changes)

Remove unused imports