Removing SOME debug code...