Remove shortname code & indexing username