Cleanups

Remove non-functional / unused stuff, avoid caching role names.