Use non-deprecated syntax, remove unused association in serializer