Cleanup: Removed the now redundant MapElementList<>