Removed debug/test code