Minor changes, removes debug code