Remove unused parameter. Clean up.