[#32] Deleted old commented out code