Removed test and debug code