Cleanup. Fix warnings. Preparing for meat purifier fix.