Analyzers Fix

Do we need this? It's all commented out