Final cleanup for 1.6, added .POT