Extreme clean up fix.