Attempting to remove debug stuff again