Removed references to username