Some debug code removed