Pull in latest changes when updating
Clean up debugging