serializer definition changed
unused code removed