Remove setup code frome Admin users store.
Started with the file Manager.
Resolve merge conflict