remove serializer stuff again, update Scope handling some more