More EOL space clean-ups.