Massive cleanups
Pod update