Commented out some debugging