Updated to remove account info