Leftover Debug code and adjusted routine for updates