Remove the old Map serializer and clean up the rest of the collections