Remove unused variables.
Add empty handler for testing.