Remove special case for anonimous