EOD Commit - map cleanup, comments