decade-old commented out stuff removed