Commented out some debug lines