Added and removed some debug code