Final cleanup for this file I think.