Cleanup and reduce size in attempt to find bug.