[support] Old stuff hanging around