Commented out some debug