Looks like factory_shipped_username was never really honoured here.
Clean this up while bringing general sanity to the file.