[refactoring] Clean up.