Clean up serializer/association nonsense