Cleanup
Remove unused vars, add @Overrides, update deprecated methods.