Fixing indexing. Removing username.