Cleanup + add poly headers