Code analysis cleanup and platforms