cleaned up Extractor Serializer, added a few function id's, removed locales for now