Lots of clean up performed while working on eaHELP/MAG themes