Removed unnecessary whoamis