Unused variables and types removed