cleanup and remove unnecessary serializer stuff.