[Icons] Clean up commented-out code