remove debug code
Changes may not ready...