Remove more traces of MAIN_LAYER. Update TODO tasks so Eclipse will pick them up (can't add name.)