Remove unused fields
Remove out of date TODO
Remove unused variables
Whitespace cleanup