Clean up for hint fix.