CHG: Removed old MEGA files
CHG: Removed more old MEGA files
BUG: Fixes suggested from cppcheck