Clean up and identify device in push to beta