Efforts to cleanup and secure Merc code