change email to andrew, remove mac address grab